[Xastir-dev] Git question

[Tom Russo]

On Mon, Apr 22, 2019 at 11:05:00AM -0500, we recorded a bogon-computron collision of the <godfreja at gmail.com> flavor, containing:
> Is origin Xastir/Xastir and upstream we7u/Xastir?
> In any case, I would probably try a git pull from origin

upstream is Xastir/Xastir and origin is we7u/Xastir.

> In general I try to avoid working in master. I will do work in another
> branch and have master track the "official" master. If needed I will update
> my local master  and then merge master into my branch to pick up any
> changes from upstream.

What he said.

> Another option would be creating a new branch that matches GitHub master
> and then cherry picking the commits you need from your local master into
> it. Once everything is checked in upstream you can blow away that clone and
> start over.

See my reply, where I give the exact set of commands necessary to put it
right again.

Blowing away the clone is unnecessary, you just need to use the right set of
resets and force pushes.

The problem here is that not only did Curt work on master, but he pushed the
changes in master to his fork.  Then I pushed other changes to upstream, 
and he rebased his local clone to that.  This caused a divergence between
the local clone, upstream, and the fork.


> - Jason
> 
> On Mon, Apr 22, 2019 at 10:26 AM Curt Mills <curt.we7u at gmail.com> wrote:
> 
> > I'll put my "gitv" output here to help Tom:
> >
> > * 9d631f5f (HEAD -> master) Second try to get GraphicsMagick into the build
> > * b0e2e82b Work to add GraphicsMagick properly
> > * 34f7373b (upstream/master) Add dependent package
> > | * 4f06ae45 (origin/master, origin/HEAD) Add dependent package
> > | * b55a086c Second try to get GraphicsMagick into the build
> > | * e6953131 Work to add GraphicsMagick properly
> > |/
> > * e7f47a88 Rename OSX build
> >
> >
> > On Mon, Apr 22, 2019 at 8:24 AM Curt Mills <curt.we7u at gmail.com> wrote:
> >
> > > So... I have my we7u/Xastir repo in this state:
> > >
> > > $ git pull upstream master
> > > From github.com:Xastir/Xastir
> > >  * branch              master     -> FETCH_HEAD
> > > Current branch master is up to date.
> > >
> > > $ git status
> > > On branch master
> > > Your branch and 'origin/master' have diverged,
> > > and have 3 and 3 different commits each, respectively.
> > >   (use "git pull" to merge the remote branch into yours)
> > > Untracked files:
> > >   (use "git add <file>..." to include in what will be committed)
> > > ...
> > > nothing added to commit but untracked files present (use "git add" to
> > > track)
> > >
> > > How do I easily resolve this? Do a "git pull origin master" and then see
> > > what I end up with?
> > >
> > > What's the easiest way to see what the top three commits are on
> > > origin/master?
> > >
> > > Using gitk I see this at the top:
> > >
> > > * master     Second try to get GraphicsMagick into the build
> > > * Work to add GraphicsMagick properly
> > > * remotes/upstream/master     Add dependent package
> > > * Rename OSX build
> > > * Fix overlooked unused result warning
> > >
> > > I don't need the top two commits: Tom Russo fixed that properly on
> > > "upstream". They were attempts to fix something for Travis-CI and I had
> > to
> > > push them up to my origin/master to get Travis-CI to kick off to test
> > them.
> > >
> > > --
> > > Curt, WE7U        http://we7u.wetnet.net
> > > http://www.sarguydigital.com
> > >
> >
> >
> > --
> > Curt, WE7U        http://we7u.wetnet.net
> > http://www.sarguydigital.com
> > _______________________________________________
> > Xastir-dev mailing list
> > Xastir-dev at lists.xastir.org
> > http://xastir.org/mailman/listinfo/xastir-dev
> >
> 
> 
> -- 
> "The problem with quotes on the Internet is that it is often difficult to
> verify their authenticity." - *Abraham Lincoln*
> _______________________________________________
> Xastir-dev mailing list
> Xastir-dev at lists.xastir.org
> http://xastir.org/mailman/listinfo/xastir-dev

-- 
Tom Russo    KM5VY
Tijeras, NM  

 echo "prpv_a'rfg_cnf_har_cvcr" | sed -e 's/_/ /g' | tr [a-m][n-z] [n-z][a-m]