#18618: sandpile revisions
-------------------------------------+-------------------------------------
Reporter: dperkinson | Owner:
Type: enhancement | Status: positive_review
Priority: major | Milestone: sage-6.8
Component: graph theory | Resolution:
Keywords: sandpile | Merged in:
Authors: David Perkinson | Reviewers: Qiaoyu Yang, Kaui Yu
Report Upstream: N/A | Work issues:
Branch: | Commit:
public/sandpile_updates | 249b64720653fdd434e76336b442c1bbd5b6fe2c
Dependencies: | Stopgaps:
-------------------------------------+-------------------------------------
Comment (by dimpase):
Replying to [comment:54 dperkinson]:
> Wow. That's pretty complicated. Thanks for your help.
>
no, not really. Git is just an interface to a directed acyclic graph on
changes to files :-)
Also, `git blame` part is entirely optional. Them there isn't much beyond
the standard merge conflict
resolution, as explained in https://help.github.com/articles/resolving-a
-merge-conflict-from-the-command-line/
> Just to make sure: if I am understanding correctly, you have just done
everything that needs to be done for the moment. In other words, the
rebasing is done, right?
>
right.
> In case further revisions are necessary, would it make sense for me now
to start from a clean slate on my local machine, following the directions
on the git-trac page (making sure to clone into a separate clean
directory)?
You could try just fetching the new branch `public/sandpile_updates` from
trac and merging it over your current working setup (beforehand you have
to commit or stash all your changes, as always).
More precisely, first create a new branch (to have a way to refer to the
new branch of your code DAG to be grown),
by `git checkout -b Foo`
Then do `git fetch trac public/sandpile_updates` followed by `git merge
FETCH_HEAD`.
If this works then you are all set to do extra changes, which you would
commit (into Foo branch) and then do
`git push trac --set-upstream HEAD:public/sandpile_updates` to update the
remote branch.
PS. I seldom use `git-trac` extension nowadays, it's too inflexible for
me.
--
Ticket URL: <http://trac.sagemath.org/ticket/18618#comment:55>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/d/optout.
