Questions tagged as 'merge'

Tagged questions
1
answer

How does the merge work?

I created another branch as a backup and I give merge to it, suppose I am in branch daniela3 : git merge origin/develop Only my branch daniela3 will be affected or origin/develop too? I mean, I'll be joining...
asked by 02.03.2015 / 14:55
2
answers

Look up values in one data.frame and add in another (R)

I have 2 data.frames, the first is a data.frame that contains stock data and a column with a unique identifier (column "ISIN") , as shown below: > Teste=data.frame(matrix(runif(20), nrow=5, ncol=4)) Teste$ISIN <- c("A1","A2","A3","A4","A5"...
asked by 19.04.2016 / 21:30
2
answers

Branch x Checkout x Automatic Merging for master

Help! If someone has gone through this or knows how to help, thank you. I created a branch: git branch <xxxx> switch to new branch: git checkout xxxx I changed a file line inside the xxxx I returned to the...
asked by 07.07.2016 / 19:11
2
answers

How do I get back to a point before a merge in GitHub?

Take a look at the graph of my commits: link I did a crap here, I wanted to do a merge of the branch workspace with the master. The workspace is what was most current, so I wanted to pass the master and delete the workspace branch. So I was...
asked by 07.06.2018 / 00:07
1
answer

Speed of table crossing - R

Good evening! I cross two bases in Rstudio, using the merge, but I would like to know if using another way (eg left_join), I get faster, because my tables can get 8 million lines. Thank you.     
asked by 08.06.2018 / 04:06
2
answers

SAS and R perform Merge differently

What is the difference between the way R and SAS execute the merge? The SAS Merge command returns 205546 rows, and the R returns 207208 rows. Here's an example. I'm working with the IBGE file available at: ftp: // ftp. ibge.gov.br/PNS/2013/...
asked by 26.01.2015 / 19:03
1
answer

The PN0 control number V0102 does not correspond to the IBGE municipalities code. How to join the banks?

Hello I am working with the food supplements of pnad04 , pnad09 and pnad13 of IBGE and with two other banks of IPEA, one on municipal GDP ipea.pib and another on investments in social programs by municipality% with%...
asked by 01.02.2016 / 05:24
1
answer

Problem when merge

I'm doing merges, and in that action, characters with accents are being swapped for symbols, I still do not know what the source of the problem is, if it's the encoding of the files, or if the problem is in git, can someone help me ? Below is an...
asked by 17.05.2018 / 16:22
1
answer

How to work with conflict management in the merge of branches?

I gave a quick study in git-flow, however, I did not identify how this works the issue of merge conflicts. In an article I read, the author mentioned each collaborator pulling the repository, managing conflicts, and then uploading their code....
asked by 12.03.2018 / 04:16
1
answer

Git merge did not happen as expected

Hello, I'm going to try to be very practical in my problem. 1 - Working on the 'correction' branch I ended up making changes to different things by mixing things ... 2 - Give to try to 'improve' I created a new child branch git checkout...
asked by 10.09.2015 / 22:03