search

jdigger / git-process

Scripts to help work with a good Git process
Apache License 2.0
65 stars 22 forks source link

Verify remote integration branch is not shadowed locally #131

Open jdigger opened 10 years ago

jdigger commented 10 years ago

For example, it's possible to have a local branch "origin/master", which can cause all kinds of things to get confused.

Ideally, this should have two parts:

  1. Do a check to make sure that the "remote" integration branch name isn't shadowed locally
  2. Use this fully-qualified branch name in the scripts (e.g., remotes/origin/master)
sagarsane commented 10 years ago

Yea.. looks like this why some people can also see errors like ambiguous origin/master .