#4665 Git merge instructions don't take source branch into account
closed
nobody
SCM
2015-08-20
2012-08-07
No
If you have a forked repo, and make changes on a non-master branch (e.g. dev), and request a merge, the git instructions that are shown to the merger don't work. Specifically, the "git merge" command fails because it doesn't know about the commit because the "git fetch" command only fetches master and not the branch (e.g. dev). "git fetch /repo/url dev" would work but we don't store the source branch (dev) on the MergeRequest artifact. Maybe "git fetch /repo/url commit-hash" would work, but that is somewhat verbose.
This should be tested (using multiple commits on a non-master branch) and then the best set of commands should be established.
Created #401: [#4665] Git merge instructions don't take source branch into account (3cp)
Related
Tickets:
#4665Dave, it seems that merge can't be done without source branch. Can we add it to MergeRequest?
Makes sense to me. Since it's a new field, make sure that when merge requests are displayed, that old records that don't have that field still work (may not be entirely accurate, but at least shoudn't error out)
Closed #401.
je/42cc_4665