search for: unstaged

> > Message: 2 > Date: Thu, 29 May 2008 06:35:01 -0700 > From: David Chelimsky <dchelimsky at gmail.com> > Subject: Re: [rspec-users] Coloured output in rspec 1.1.4 > To: rspec-users at rubyforge.org > Message-ID: <175B70FE-B706-4C03-8B20-C5B207268AD6 at gmail.com> > Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes > > On May 29, 2008,

...n po/pt_PT.po Automatic merge failed; fix conflicts and then commit the result. How can I see the conflicts? I guess they are actually the changes I've sent in the first place. But I'm not sure how to deal with this. I also tried: > git fetch; git rebase origin cannot rebase: you have unstaged changes U po/pt_PT.po M po/pt_PT.po How can I make this work??

I owe you a gala dinner at your favorite restaurant. Really. A few questions: Why did you 'git pull --rebase' when the branch was up-to-date? Is this just a safety habit? I don't understand the pushing upstream. Since we use Phabricator, isn't that the job of the person who commits the patch? Does git keep all my branches up-to-date with the origin? Say I come in tomorrow and

I think I understand the concepts, but I sure would appreciate a specific example, and I appreciate the offer. To make your life harder, could you start with what I should do given that I have not created a branch for the first patch? I just have the six files staged. I have GitHub Desktop installed, if that makes any of the steps easier. Thanks again, and no rush! At 8/10/2020 10:07 AM,

On Wed, Jun 1, 2016 at 6:31 PM, Renato Golin <renato.golin at linaro.org> wrote: > I think we should start two other threads: one about git tooling on Windows > and one about infrastructure problems migrating to git. Some developers on Windows prefer to use GUI tools like TortoiseSVN to command line tools for version control. The last time I tried TortoiseGit on Windows (which was

Hi Vishal, Ruijie, Thanks for your interest in the project. To get started, the first task would be to merge the 5 patches on top of trunk llvm. The list of patches are listed in the project description: http://llvm.org/OpenProjects.html#llvm_mergesim Please create an account in llvm phabricator (reviews.llvm.org) if you haven't already, and put your patches there. Let me know if you have