Databases
StackOverflow2013
Postsdbo
PO
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    text
    copied!<p>Well, yes, and no...</p> <p>I understand that you want your local copies to "override" what's in the remote, but, oh, man, if someone has modified the files in the remote repo in some <em>different</em> way, and you just <em>ignore</em> their changes and try to "force" your own changes without even <em>looking</em> at possible conflicts, well, I weep for you (and your coworkers) ;-)</p> <p>That said, though, it's <strong>really</strong> easy to do the "right thing..."</p> <p><strong>Step 1:</strong></p> <pre><code>git stash </code></pre> <p>in your local repo. That will save away your local updates into the stash, then revert your modified files back to their pre-edit state.</p> <p><strong>Step 2:</strong></p> <pre><code>git pull </code></pre> <p>to get any modified versions. Now, hopefully, that won't get any new versions of the files you're worried about. If it doesn't, then the next step will work smoothly. If it <em>does</em>, then you've got some work to do, and you'll be glad you did.</p> <p><strong>Step 3:</strong></p> <pre><code>git stash pop </code></pre> <p>That will merge your modified versions that you stashed away in Step 1 with the versions you just pulled in Step 2. If everything goes smoothly, then you'll be all set!</p> <p>If, on the other hand, there were <em>real</em> conflicts between what you pulled in Step 2 and your modifications (due to someone else editing in the interim), you'll find out and be told to resolve them. Do it.</p> <p>Things will work out <em>much</em> better this way - it will probably keep your changes without any real work on your part, while alerting you to serious, serious issues.</p>
 

Querying!

 
Guidance
An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload