The confusion there would be public vs private branches (never publish
> to a public branch that _will_ be used by team mates). But I would still
> expect that individual developers would need to fixup and rework their
> private branches before publishing to a public branch. And if they have
>
On 03/03/13 11:26, Thomas Ferris Nicolaisen wrote:
The confusion there would be public vs private branches (never publish
to a public branch that _will_ be used by team mates). But I would
still
expect that individual developers would need to fixup and rework their
private branch
I did a GIT STASH (working in Windows command line). Now I can't restore
from it
I get the message:
TECHNOTE/git.TXT: needs merge
unable to refresh index
I tried commiting that file and I tried deleting it, but I still get the
same problem.
I really don't care about that particular f
On Sun, 3 Mar 2013 09:27:03 -0800 (PST)
Tom Green wrote:
> I did a GIT STASH (working in Windows command line). Now I can't
> restore from it
> I get the message:
> TECHNOTE/git.TXT: needs merge
> unable to refresh index
>
> I tried commiting that file and I tried deleting it, but I sti
Git is also used in syncing files and deployment. In my opinion that is a
bit wrong, and more of a coincidence because it's so damn easy to push for
the development server etc. and I don't want to litter my version control
with sync commits and pushes. I'm trying to now have a second .git
direc
On Sun, 3 Mar 2013 10:06:40 -0800 (PST)
Jari Pennanen wrote:
[...]
> Anyhow, the problem is with the second repository ".gitsync", it also
> uses the ".gitignore" files from my project's version control
> (the .git dir), and I don't want to use those in syncing / backup.
> Ideally ".gitignore" fi
Thanks, Konstantin. How do I go about merging that one file in my stash
into my working directory so I can proceed?
On Sunday, March 3, 2013 12:27:03 PM UTC-5, Tom Green wrote:
> I did a GIT STASH (working in Windows command line). Now I can't restore
> from it
> I get the message:
> TECH
> From: Konstantin Khomoutov
>
> > Anyhow, the problem is with the second repository ".gitsync", it also
> > uses the ".gitignore" files from my project's version control
> > (the .git dir), and I don't want to use those in syncing / backup.
> > Ideally ".gitignore" filename should be configurabl
Solved.
I was able to see the information on "Disconnect" for Eclipse Juno
(although the menu screen shots were not the same as mine) I was able to
disconnect and then delete the project (after backing up everything),
create a new package, and import it. Worked well, thanks.
On Thursday, 28 Fe
On Sun, Mar 03, 2013 at 11:56:10AM -0800, Tom Green wrote:
> > I did a GIT STASH (working in Windows command line). Now I can't restore
> > from it
> > I get the message:
> > TECHNOTE/git.TXT: needs merge
> > unable to refresh index
[...]
> Thanks, Konstantin. How do I go about merging t
On Sun, Mar 03, 2013 at 03:09:05PM -0500, Dale R. Worley wrote:
> > > Anyhow, the problem is with the second repository ".gitsync", it also
> > > uses the ".gitignore" files from my project's version control
> > > (the .git dir), and I don't want to use those in syncing / backup.
> > > Ideally ".g
On Sunday, March 3, 2013 5:25:30 PM UTC-5, Konstantin Khomoutov wrote:
>
> On Sun, Mar 03, 2013 at 11:56:10AM -0800, Tom Green wrote:
>
> > > I did a GIT STASH (working in Windows command line). Now I can't
> restore
> > > from it
> > > I get the message:
> > > TECHNOTE/git.TXT: needs mer
Hi!
On Monday, March 4, 2013 12:32:10 AM UTC+2, Konstantin Khomoutov wrote:
>
> I still would like to hear from the OP about the specific commands
> he's having trouble with as the problem might turn to be a non-issue.
>
In my case the second git (the .gitsync directory) should act like a
Drop
13 matches
Mail list logo
