Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

git trac try "over-current-branch"? #15

Open
dimpase opened this issue Jun 14, 2014 · 2 comments
Open

git trac try "over-current-branch"? #15

dimpase opened this issue Jun 14, 2014 · 2 comments

Comments

@dimpase
Copy link
Member

dimpase commented Jun 14, 2014

There are cases where you don't want git trac try doing self.git.fetch('trac', 'develop').
E.g. I need (sage's) #16440 to build docs, while the current 'develop' does not have it merged. Perhaps 'try' should get an option to specify that develop should not be used as the base.

@vbraun
Copy link
Member

vbraun commented Jun 18, 2014

If you need another fix to build the docs, say, then you can just "git merge docbuild-fix" after "git try ...". There is no need for an alternate UI for that.

@dimpase
Copy link
Member Author

dimpase commented Jun 19, 2014

well, this would potentially produce differently looking conflicts, as only conflictless merges commute . Logically, one would like to check whether the new ticket conflicts with the existing work branch, not the other way around.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants