Generally `git pull` is enough, but I&#39;m not sure what layout you have chosen (or has github chosen for you).

Assuming their updates are on master, and you are on the branch you want to merge the changes into.

    git remote add origin https://github.com/&lt;github-username&gt;/&lt;repo-name&gt;.git
    git pull origin master

Also note that you will then want to push the merge back to your copy of the repository:

    git push origin master

You have to add the original repo as an upstream.

It is all well described here: https://help.github.com/articles/fork-a-repo


    git remote add upstream https://github.com/octocat/Spoon-Knife.git
    git fetch upstream
    git merge upstream/master
    git push origin master



You need to add the original repository (the one that you forked) as a remote.

&gt; git remote add github (clone url for the orignal repository)

Then you need to bring in the changes to your local repository

&gt; git fetch github

Now you will have all the branches of the original repository in your local one. For example, the master branch will be `github/master`. With these branches you can do what you will. Merge them into your branches etc

When building WAR package using Maven 2.1.1, I get this warning message:

    [WARNING] Warning: selected war files include a WEB-INF/web.xml which will be ig
    nored
    (webxml attribute is missing from war task, or ignoreWebxml attribute is specifi
    ed as &#39;true&#39;)

Is there a way to eliminate it? It doesn&#39;t fail the building process, but I just do not want to see it.

Disable Maven warning message - &quot;Selected war files include a WEB-INF/web.xml which will be ignored&quot;

&gt;An enclosing instance that contains &lt;my reference&gt; is required

Below is the code. `positionObj` is the object that I am trying to use and it is giving me the above error.

It&#39;s unclear why.


	package toolBox;
 	import toolBox.Secretary.positionObj;    
 
 	public class PositionManagement {
		public static HashMap&lt;String, Secretary.positionObj&gt; main(String vArg){
			positionObj newPosition=new positionObj();
		}
	}

An enclosing instance that contains &lt;my reference&gt; is required


I forked a project on github, made some changes, so far so good.

In the meantime, the repository I forked from changed and I would like to get those changes into my repository. How do I do that ?

How to sync with a remote Git repository?

<p>I forked a project on github, made some changes, so far so good.</p>
<p>In the meantime, the repository I forked from changed and I would like to get those changes into my repository. How do I do that ?</p>


I&#39;ve read about some tricks with merge in https://stackoverflow.com/questions/1807036/git-merging-public-and-private-branches-while-while-keeping-certain-files-intact and others and not found a solution.

In my case I&#39;m feeling need to do opposite merge strategy. In parallel development I have to keep some files same across the arbitrary branches. From other side I do not want to do squash or no-commit merge, while difference are significant and could break current state of testing branch. 

What I want something like 

`git checkout testing`

`git merge config.xml -b development` or `git merge config\*.xml -b development`

I guess this is like `git merge-files ...` command, but second file delivered from the branch, not from the filesystem.
Is it possible? or may be there is a kind of workaround? submodules? attributes?

Thanks

git partial merge, not whole branch

I often have at least 3 remote branches: master, staging and production. I have 3 local branches that track those remote branches.

Updating all my local branches is tedious:

    git fetch --all
    git rebase origin/master
    git checkout staging
    git rebase origin/staging
    git checkout production
    git rebase origin/production

I&#39;d love to be able to just do a &quot;git pull -all&quot;, but I haven&#39;t been able to get it to work. It seems to do a &quot;fetch --all&quot;, then updates (fast forward or merges) the current working branch, but not the other local branches.

I&#39;m still stuck manually switching to each local branch and updating.

Can &quot;git pull --all&quot; update all my local branches?

I am very new to git and wondered how I should go about a merge where in the local repo I have deleted several files on the master branch but these files exist within the remote master branch.

After doing git-merge it shows the conflicts that have occured.

Using git gui it shows that the local file is deleted, while the remote branch file has contents.

How do you stop these files from being conflicted?
Is there a simple way using git gui?

Many thanks



git - merge conflict when local is deleted but file exists in remote

I have asked Git to perform a commit from within git bash, It has brought up VI as it always does.

I now wish to cancel the commit, how do I prevent proceeding with the commit from this point?

How do I stop a Git commit when VI is on the screen waiting for a commit message?

When I run `git reset --hard HEAD`, it&#39;s supposed to reset to a pristine version of what you pulled, as I understand it.  Unfortunately, it leaves files lying around, as a `git status` shows a big list of untracked files.

How do you tell git &quot;Just bring it back to EXACTLY what was in the last pull, nothing more, nothing less&quot;?


git reset --hard HEAD leaves untracked files behind

Is it true that C++0x will come without semaphores? There are already some questions on Stack Overflow regarding the use of semaphores. I use them (posix semaphores) all the time to let a thread wait for some event in another thread:

    void thread0(...)
    {
      doSomething0();
    
      event1.wait();

      ...
    }

    void thread1(...)
    {
      doSomething1();
    
      event1.post();

      ...
    }

If I would do that with a mutex:

    void thread0(...)
    {
      doSomething0();
    
      event1.lock(); event1.unlock();

      ...
    }

    void thread1(...)
    {
      event1.lock();

      doSomethingth1();
    
      event1.unlock();

      ...
    }

Problem: It&#39;s ugly and it&#39;s not guaranteed that thread1 locks the mutex first (Given that the same thread should lock and unlock a mutex, you also can&#39;t lock event1 before thread0 and thread1 started).

So since boost doesn&#39;t have semaphores either, what is the simplest way to achieve the above?

C++0x has no semaphores? How to synchronize threads?

I&#39;m new to multithreading, and was trying to understand how mutexes work. Did a lot of Googling but it still left some doubts of how it works because I created my own program in which locking didn&#39;t work.

One absolutely non-intuitive syntax of the mutex is `pthread_mutex_lock( &amp;mutex1 );`, where it looks like the mutex is being locked, when what I really want to lock is some other variable. Does this syntax mean that locking a mutex locks a region of code until the mutex is unlocked? Then how do threads know that the region is locked? [*UPDATE: Threads know that the region is locked, by* [Memory Fencing][2] ]. And isn&#39;t such a phenomenon supposed to be called critical section? [*UPDATE: Critical section objects are available in Windows only, where the objects are faster than mutexes and are visible only to the thread which implements it. Otherwise, critical section just refers to the area of code protected by a mutex*]

In short, could you please help with the simplest possible mutex **example program** and the simplest possible **explanation** on the logic of how it works? I&#39;m sure this will help ***plenty*** of other newbies.


  [1]: http://www.yolinux.com/TUTORIALS/LinuxTutorialPosixThreads.html
  [2]: http://en.wikipedia.org/wiki/Memory_barrier#Multithreaded_programming_and_memory_visibility

Mutex example / tutorial?

[Raymond Chen](http://blogs.msdn.com/b/oldnewthing/) has been doing a [huge](http://blogs.msdn.com/b/oldnewthing/archive/2011/04/15/10154245.aspx) [series](http://blogs.msdn.com/b/oldnewthing/archive/2011/04/14/10153633.aspx) [on](http://blogs.msdn.com/b/oldnewthing/archive/2011/04/13/10152929.aspx) [lockfree](http://blogs.msdn.com/b/oldnewthing/archive/2011/04/12/10152296.aspx) [algorithms](http://blogs.msdn.com/b/oldnewthing/archive/2011/04/08/10151159.aspx). Beyond the simple cases of the `InterlockedXxx` functions, it seems like the prevailing pattern with all of these is that they *implement their own locks*. Sure, there are not processor locks, but the concept of looping over and over on each CPU to ensure consistency is very much like a spinlock. And being a spinlock, they are going to be less efficient than the general locks that come with the operating system because they do not yield control of their quanta while waiting for other threads. Therefore, whenever someone comes to me and says &quot;but my algorithm is lock-free&quot;, my general response is &quot;so&quot;?

I&#39;m curious -- are there **benchmarks** available which show lock free algorithms to have an edge over their lock-full counterparts?

Do lock-free algorithms really perform better than their lock-full counterparts?

Let me use this small and simple sample:

    class Sample {
        private String msg = null;

        public void newmsg(String x){
            msg = x;
        }

        public String getmsg(){
            String temp = msg;
            msg = null;
            return temp;
        }
    }

Let&#39;s assume the function `newmsg()` is called by other threads that I don&#39;t have access to. 

I want to use the synchonize method to guarantee that the string `msg` is only used by one function per time. In other words, function `newmsg()` cannot run at the same time as `getmsg()`.

How to synchronize or lock upon variables in Java?

I think both are doing the same job,how do you decide which one to use for synchronization?

When should one use a spinlock instead of mutex?

How do I check out version version/tag 1.1.4 of the [rspec bundle][1]?

    cd ~/Library/Application\ Support/TextMate/Bundles/
    git clone git://github.com/rspec/rspec-tmbundle.git RSpec.tmbundle
    osascript -e &#39;tell app &quot;TextMate&quot; to reload bundles&#39;


  [1]: https://github.com/rspec/rspec-tmbundle

Switch to another Git tag

In Github, is there a way I can see the number of downloads for a repo? 

Github: Can I see the number of downloads for a repo?

My repo has 100 commits in it right now. I need to rollback the repository to commit 80, and remove all the subsequent ones.

Why?

This repo is supposed to be for merging from miscellaneous users. A bunch of merges went in as commits from me, due to excessive editing. That was due to a mislabeling of my remote branches, where 3 developers were labeled as each other. I need to reset to that point, and then pull forwards.

I wanted to rebase, as in this example: &lt;https://stackoverflow.com/questions/448919/how-can-i-remove-a-commit-on-github&gt;

However, git wants me to do a lot of conflict management. Is there a simpler way?

How can I rollback a git repository to a specific commit?

I would like to contribute to a certain project in [GitHub][1]. Should I **fork** it? **Branch** it? What is recommended and how to do it?

  [1]: http://en.wikipedia.org/wiki/GitHub


How do I contribute to other&#39;s code in GitHub?

What is the difference between the `HEAD` and `master` in Git?

I did a clone of a project on GitHub and want to push my changes to the remote. But to which one should I push?

![screenshot](https://i.stack.imgur.com/2yC3l.png)

Content Type	Original Author	Original Content on Stackoverflow
Question	George Profenza	View Question on Stackoverflow
Solution 1 - Git	Šimon Tóth	View Answer on Stackoverflow
Solution 2 - Git	Mark Hibberd	View Answer on Stackoverflow
Solution 3 - Git	Alex	View Answer on Stackoverflow
Solution 4 - Git	Abizern	View Answer on Stackoverflow

How to sync with a remote Git repository?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

An enclosing instance that contains <my reference> is required

Disable Maven warning message - "Selected war files include a WEB-INF/web.xml which will be ignored"

Attributions