more git weirdness (git rebase, merge conflicts

2013-03-27 Thread J.V.
and force pull from origin/dev while keeping all local files that have not been added to my local repo. How do I stop this madness and get back to local dev and force pull from origin/dev = which is our master. Any help would be greatly appreciated. thanks J.V. -- To unsubscribe from

which files will have conflicts between two branches?

2013-03-27 Thread J.V.
no merge conflicts if anyone has not checked in anything. --- Also with two local branches, Is there a way to get a list of files (one line per file) of files that would have merge conflicts that would need to be resolved? thanks J.V. -- To unsubscribe from this list: send the line

merge help

2013-03-26 Thread J.V.
this initial process, (what is best recommended it would be most helpful). thanks J.V. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

stuck and need unstuck (git checkout)

2013-03-25 Thread J.V.
and simply want to go back. git reset and git stash do not get me there. thanks J.V. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

git repo on Win 2008

2013-03-04 Thread J.V.
What is the best way to host a shared git repo on a Windows 2008 box? I would like to create a repo on the 2008 box (that everyone will pull/push to), but add the initial code from my developer (Windows7 box). J.V. -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: problem switching branches

2013-03-01 Thread J.V.
On 2/26/2013 10:17 PM, Jeff King wrote: On Tue, Feb 26, 2013 at 04:08:55PM -0700, J.V. wrote: I was on my master branch, I then checked out a branch ( origin/somebranch ), made no updates but did a few git pulls on the branch over about a week; then made a small change to only a single file

problem switching branches

2013-02-26 Thread J.V.
I was on my master branch, I then checked out a branch ( origin/somebranch ), made no updates but did a few git pulls on the branch over about a week; then made a small change to only a single file committed pushed. Now am trying to go back to my master branch and get: error: The following

git checkout problem

2013-02-22 Thread J.V.
I was on my master branch, I checked out a branch (origin/somebranch), did nothing, made no updates but did a few git pulls over about a week; made a small change to one file comitted pushed. Now am trying to go back to my master branch and get: error: The following untracked working tree