syncing a fork from base upstream - Github



If it's been a while since you forked a repository on github , there are very good possibilities that the base repository is now updated and you would like to sync your local repo to the upstream repo.

There are two ways you can do this: the github GUI or the command prompt:

From the UI:


  1. Open the forked git repo forkedRepo
  2. Click on compare 
  3. You will get this notification "There isn't anything to compare baseRepo is up to date with all commits from forkedRepo. Try switching the base for your comparison."
  4. Click on switching the base on this page. 
  5. Then you get to see all the commits made to baseRepo after the day you forked it.
  6. Click on "Click to create a pull request for this comparison"
  7. Give the pull request a title and maybe a description and click send pull request.
  8. On the next page, Scroll to the bottom of the page and click merge pull request and confirm merge.
  9. Your Git repo forkedRepo will be updated!!!
  10. You can smile now :)

From the command prompt:
  1. Open Terminal (for Mac and Linux users) or the command prompt (for Windows users).
  2. Change the current working directory to your local project.
  3. Check out the branch you wish to merge to. Usually, you will merge into master.
    $ git checkout master
  4. Pull the desired branch from the upstream repository. This method will retain the commit history without modification.
    $ git pull https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git BRANCH_NAME
  5. Commit the merge.
  6. Push the merge to your GitHub repository. git push origin master
  7. You can smile now :)

Popular posts from this blog

Software Testing @ Microsoft

Image
In continuation from my previous  series of posts  targeting testing in top few companies from the technology space. After  Software Testing @Facebook  and @Google  we shall now look at Microsoft: Testing@Microsoft Software Development Engineers in Test (SDETs) are usually just called Test and sometimes Software Testing. SDETs are responsible for maintaining high testing and qualityassurance standards for all Microsoft products. Software Development Engineers (SDEs) are often referred to as Software Development. SDEs write the code that drives Microsoft products and upgrades. Very few teams in Microsoft are still using SDETs to do significant amount of manual testing. Manual testing is mainly outsourced. Actually, as early as in 2004, for example, most of the manual testing of MSN Explorer was outsourced. Think about it this way: it just doesn't make sense for test manager to spend their headcount (SDETs) on something can be easily outsourced.  Until 2005, Microso
Read more

Trim / Remove spaces in Xpath?

Image
If you are wondering how you can trim the spaces in your xpath, this is how: The normalize-space function strips leading and trailing white-space from a string, replaces sequences of white-space characters by a single space, and returns the resulting string. Example : Which one is better? //td[starts-with(normalize-space(),'Text to Trim')] //td[starts-with(normalize-space(text()),' Text to Trim ')] The second option is better as it targets at the specific nodes More string functions in XPATH: Functions Description starts-with( string1 ,  string2 ) Returns true if the first string starts with the second string. contains( string1 ,  string2 ) Returns true if the first string contains the second string. substring( string offset length ) Returns a section of the string. The section starts at  offset (which is a number), and is as long as the value provided at  length. substring-before( string1 ,  string2 ) Returns the part of  string1  up unti
Read more