Questions tagged [master]

603 questions
194
votes
3 answers

Difference between HEAD and master

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?
Frederik Heyninck
  • 3,335
  • 4
  • 18
  • 19
189
votes
4 answers

Putting uncommitted changes at Master to a new branch by Git

How can you put uncommitted changes to a branch TEST when I am at the branch master?
Léo Léopold Hertz 준영
  • 119,377
  • 159
  • 417
  • 655
175
votes
25 answers

ElasticSearch: Unassigned Shards, how to fix?

I have an ES cluster with 4 nodes: number_of_replicas: 1 search01 - master: false, data: false search02 - master: true, data: true search03 - master: false, data: true search04 - master: false, data: true I had to restart search03, and when it came…
Spanky
  • 5,114
  • 10
  • 33
  • 44
53
votes
12 answers

Gerrit error when Change-Id in commit messages are missing

I set up a branch in the remote repository and made some commits on that branch. Now I want to merge the remote branch to the remote master. Basically follows are my operations: checkout branch checkout master merge branch and fix merging…
Pan Ruochen
  • 1,656
  • 5
  • 19
  • 29
45
votes
4 answers

Error: "could not initailize master info structure" while doing Master Slave Replication in MySQL

I am trying to do Master Slave Replication for MySQL. When i am typing the following command: CHANGE MASTER TO MASTER_HOST='10.1.100.1', MASTER_USER='slave_user', MASTER_PASSWORD='slave_password', MASTER_LOG_FILE='mysql-bin.000001',…
user619684
  • 551
  • 1
  • 4
  • 4
35
votes
4 answers

How to view diff of a forked github project

I have forked a project on github and need to have a set of changes I made since I forked, in diff format. If you wonder - I've forked Apache httpd and I'm changing some code in core. Currently I'm not commiting any changes, running git diff, and…
GDR
  • 2,173
  • 1
  • 19
  • 25
34
votes
6 answers

Git: move changes off of master branch

Basic question but this happens to me all the time: Make changes in a working-branch Switch to master git merge working-branch git push cap deploy(to staging) make a new cup of tea then I come back and think of something else and start…
Meltemi
  • 36,348
  • 48
  • 182
  • 274
17
votes
2 answers

mysql replication - slave server on one database

I couldn't find an answer to my question. I have 2 mysql servers. Master server Slave server Now i want to add another Slave server but i have other website running on that server. Can i replicate just one database?
sabansaulic
  • 369
  • 2
  • 4
  • 10
14
votes
2 answers

create a git symbolic ref in remote repository

In my remote bare repository the HEAD is pointing to "refs/heads/master" and I want it to point to "refs/heads/other". I am not able to go to remote repository directory and run git symbolic-ref. Is there any git command to achieve it? Or any other…
Daniel Fanjul
  • 3,433
  • 3
  • 24
  • 28
14
votes
1 answer

Updating project version number on git push

I have a project hosted on Github, and I would like to set it up such that the project has a version number, and the version number is only updated when the master branch is updated, either directly by a push, or via a merged Pull Request. Is there…
dabs
  • 707
  • 1
  • 6
  • 22
14
votes
3 answers

How to Set Master Page dynamically?

I have requirement in which i want to set different Master Pages for the Same Page depending upon userid(i.e. for one user it must set one master page and for another user it must set another master ).Can we set different Master pages for any page…
Amol Kolekar
  • 2,227
  • 4
  • 25
  • 41
12
votes
1 answer

How to take updates from Master into Branch in TortoiseGit

I have created a branch in Git repository 10 days before and worked on some changes in the created branch. Now I need to update my branch with master updates (ie commits done over the master after the branch taken) and need to merge with…
Rithik_Star
  • 561
  • 5
  • 12
  • 29
12
votes
1 answer

git - update fork's master & rebase my branch onto it?

I have forked a github project, then cloned it locally. I then made some changes in a new branch on my_github/the_project repo. I then added and committed the changes and pushed to my github repo and submitted a pull request. The owner has received…
Michael Durrant
  • 84,444
  • 83
  • 284
  • 429
11
votes
2 answers

Why does git say I am 40 commits ahead when I seem up to date and a push-pull (no files) fixes it?

I switch to master and it says I am ahead by 40 commits: $ git checkout master Switched to branch 'master' Your branch is ahead of 'origin/master' by 40 commits. But when I then do a pull it says I am up-to-date: $ git pull origin master From…
Michael Durrant
  • 84,444
  • 83
  • 284
  • 429
10
votes
1 answer

Git: Will merging master into a topic branch often avoid conflicts later on?

Lets say for the sake of argument that we don't care much about history. If I have a master branch that is being updated somewhat often and I have a shared topic branch that is rather long lived, will regularly merging master-> topic branch (and…
Ben
  • 7,182
  • 13
  • 43
  • 62
1
2 3
40 41