Skip to content

Riot602

username-removed-851501 requested to merge oddvar/old_fdroiddata:riot602 into master

Hey again - I created a new branch, made 1 change and commit (https://gitlab.com/oddvar/fdroiddata/commit/5d3cea5c82d7ab563a7b1bd8e123f84b09646f70) and hit "new merge request".

And now I'm getting 8 commits??? How can I "check" or "accept" those commits so they don't get re-submitted in every new MR I submit? (see https://gitlab.com/fdroid/fdroiddata/merge_requests/1837 for previous MR pain)

edit: ok so I git pull'ed and sorted the merge conflict. I guess my question is "how do I git pull / checkout master before submitting a MR so that the merged pull changes don't get added to the MR"?

Merge request reports