tschwery/site-les-archers-du-bisse
1
0
Fork 0
Code Issues Pull requests1 Projects Releases Packages Wiki Activity Actions

Ajout d'une nouvelle page pour le comité et responsables #1

Open
tschwery wants to merge 1 commit from add-comite-page into master
Conversation 0 Commits 1 Files changed 6 +96
tschwery commented 2019-11-10 14:40:54 +00:00 (Migrated from git.inf3.xyz)
No description provided.
This pull request has changes conflicting with the target branch.
  • site/static/images/banner5.jpg
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin add-comite-page:add-comite-page
git checkout add-comite-page

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff add-comite-page
git checkout add-comite-page
git rebase master
git checkout master
git merge --ff-only add-comite-page
git checkout add-comite-page
git rebase master
git checkout master
git merge --no-ff add-comite-page
git checkout master
git merge --squash add-comite-page
git checkout master
git merge --ff-only add-comite-page
git checkout master
git merge add-comite-page
git push origin master
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: tschwery/site-les-archers-du-bisse#1
No description provided.
Delete branch "add-comite-page"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?