Most voted "merge" questions
49 questions
Sort by count of
-
22
votes2
answers4841
viewsHow does the merge work?
I created another branch as backup and give merge in it, suppose I’m in branch daniela3: git merge origin/develop Only my branch daniela3 will be affected or origin/develop too? I mean, I’ll be…
-
16
votes2
answers7712
viewsSearch for values in one data.frame and add to 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 an example below: Teste=data.frame(matrix(runif(20), nrow=5,…
-
6
votes2
answers589
viewsBranch x Checkout x Merging automatico for master
Help! If anyone’s been there or knows how to help, I’ll thank you. created a branch: git branch <xxxx> changed to new branch: git checkout xxxx I changed a file line inside the branch xxxx I…
-
5
votes2
answers4605
viewsGIT - Commit to another branch
I am working on a project that has two branchs (master and dev). I started the implementation of a new Feature in the system but, halfway through, I realized I was making the changes in the master,…
-
4
votes1
answer649
viewsHow to undo merge keeping changes made after
The branch feature had a merge of aleatorio. How to delete this merge by keeping changes made in feature, before and after the merge?…
-
4
votes2
answers2079
viewsHow to get back to a point before merging into Github
Take a look at my commits chart: https://github.com/danieldspx/cni/network I took a dump here, I wanted to merge the Workspace branch with the master. The Workspace is the one that was more current,…
-
4
votes1
answer90
viewsMerge into two worksheets format . csv in R
I’m doing a job using the transparency portal, I need to join two databases prof1.csv and prof2.csv. The final result of merge, that I named prof.csv, is doubling rows due to columns 18 of gross…
-
4
votes1
answer53
viewsRelate two dataframes using python logic
Hello, I need to relate the two dataframes below using conditions (i) if df1 cat is in the tuple of the df2 cat column; and (ii) the event column. The result should be a column 'Resp' in df1 that…
-
3
votes2
answers647
viewsSAS and R run Merge differently
What is the difference between how R and SAS perform merge? The SAS Merge command returns 205546 lines whereas the R command returns 207208 lines. Following example. I am working with the IBGE file…
-
3
votes1
answer139
viewsSpeed in crossing tables - R
good night! I cross two bases in Rstudio, using the merge, however, I would like to know if using another crossover medium (ex:left_join), I get faster, because my tables reach 8 million lines.…
-
3
votes2
answers72
viewsHow to turn a column with a sentence per row into a column where each row is a word of these phrases?
I have the following structure: structure(list(frases = c("agricultura pecuária e serviços relacionados", "produção de lavouras temporárias", "cultivo de cereais", "cultivo de arroz", "cultivo de…
-
2
votes1
answer336
viewsGit merge did not go as expected
Hello, I will try to be very practical in this my problem. 1 - Working on the 'fix' branch I ended up making changes to different things by mixing things up... 2 - Dai to try to 'improve' created a…
-
2
votes2
answers441
viewsOutdated branch pull request in Git
I created a branch of a repository in the Github. I worked on that branch creating their own commits. The branch is in the remote repository. However, the master, developing code in master. In…
-
2
votes1
answer360
viewsHow do I work with branch merge conflict management?
I did a quick study on git-flow, but I didn’t identify how it works on the merge conflict issue. In an article I read, the author mentioned each contributor pulling the repository, managing…
-
2
votes1
answer687
viewsThe control number V0102 of PNAD does not correspond to the code of municipalities of IBGE. How to unite the banks?
Hello! I’m working with food safety supplements from pnad04, pnad09 and pnad13 IBGE and two other IPEA banks, one on municipal GDP ipea.pib and other on investments in social programs by…
-
2
votes1
answer146
viewsProblem when merging
I’m doing merges, and in this action, accented characters are being swapped for symbols, I still don’t know what the source of the problem is, if it’s the encoding of the files, or if the problem is…
-
2
votes1
answer29
viewsGIT: Permission error in git merge
Utilizo Ubuntu. A strange thing happens. I have the main project in the master branch and made a new branch for changes and tests. When I create new files in this new branch everything is ok, no…
-
1
votes1
answer163
viewsWhat is the MERGE_MSG.swp file?
When executing the command of merge of my branch in another. The following warning has occurred: As per the image description itself. The alert is displayed because the file .MERGE_MSG.swp is also…
-
1
votes1
answer133
viewsProcedure pl/sql
Do you guys talk? Well I am new in PL/SQL and I am creating my first Precedent, because I need to load in two tables (Insert or Change), I am using Merge. But when I try to run my past I already get…
-
1
votes1
answer2425
viewsPython -> how to merge multiple csv files
I have 4 folders, and each of them is filled with csvs of 3 types (ap,peers,visits). I’m a beginner in python, but I wanted to create a python script that would merge the files that are peer, in…
-
1
votes0
answers109
viewsFailed to Merge Android Manifest.xml with Admob [UNITY]
The error is present when I try to build my Android game in Unity, it simply accuses error and says that it was not possible to merge the Androidmanifest.xml file.. Erro1 Androidsdktoolsexception:…
-
1
votes2
answers240
viewsProblems with the merge function
I’m having trouble with the job merge out of nowhere she stopped "Merger" the date frames.. It seems she instead of using say the cbind, she’s using rbind and what is worst triple echo (each=3).…
-
1
votes1
answer887
viewsI am not able to finish the merge always appears this error:
fatal: Exiting because of an unresolved conflict. U course-git-blog-project When I merged a branch, it conflicted with the code on the master branch. I correct the code in hand, saved index.html but…
-
1
votes1
answer309
viewsCombine TIFF files on a multi-page TIFF C#
I’m making a program to convert and concatenate files. I wanted, after converting the PDF files into TIFF, to combine them into a single multi-page TIFF file. I’ve been looking for a long time and I…
-
1
votes1
answer158
viewsWhy use double clasps in Pandas?
Given the following Dataframes: df = pd.DataFrame([[1, 2, 1], [4, 5, 2], [1, 2 , 3]], columns=['coluna1', 'coluna2','id']) df2 = pd.DataFrame([[1, 7, 1], [4, 'a', 2], [1, 'abc', 3]],…
-
1
votes1
answer52
viewsHow to merge these 2 dataframes and filter the latest timestamp to repeated values?
I have 2 dataframes that I would like to merge DF1: MRN Encounter ID First Name Last Name Birth Date Admission D/T \ 0 1 1234 John Doe 01/02/1999 04/12/2002 5:00 PM 1 2 2345 Joanne Lee 04/19/2002…
-
0
votes2
answers432
viewsMerge using Hibernate without erasing other Java data
I use Hibernate in my Java application for database interaction using a controller class created even by Netbeans, but the problem I have is this: when making an edit in some field and only pass…
-
0
votes1
answer2326
viewsConflict Resolution in Git
Good afternoon I work with the Git version manager, and in turn when merging I come across complicated conflicts to resolve. Is there a tool that can somehow better deal with these conflicts? The…
-
0
votes1
answer146
viewsMerge between multiple Databases
I have a canteen system that performs sales in different schools. This system only works online, saving the sales movements on the matrix server (MS SQL). To optimize the system, I would like to…
-
0
votes1
answer371
viewsPHP multi-level array_merge. How to do?
I have the following array: $arrIni["ENV"]="US"; $arrIni["sap_db_server"] = "192.xxx.x.xx"; $arrIni["local_db_server"] = "localhost"; $arrIni["local_db_username"] = "root"; //Default settings…
-
0
votes0
answers54
viewsWorking with branchs in git
I have a problem understanding GIT, whether the "master" branch is used for production and the "Development" branch for staging. When I create a branch to work on a new Feature, create the "master"…
-
0
votes1
answer395
viewsJoin multiple mp3 files into a single mp3 file
Hello! I would like to create a program (in C language or other capable) that receives as input a text and return me as output a song. For this I would need a text file (.txt) where I would need to…
-
0
votes1
answer101
viewsError in the interlayer method elements with Mergesort in a List<Integer>
This part of the algorithm has the function of bridging the elements of a List<Integer> (list of normal integers) using the Mergesort sorting algorithm. ERROR ON LINE 7 private static List…
-
0
votes0
answers66
viewsHow to unify two tables with repeated primary keys?
I have two tables that we need to unify in one, in a complete way: Consider everything there is in the first, see if it matches with the second and what does not hit or repeat, include in the lines…
-
0
votes0
answers166
viewsHow does a Merge Sort work exactly?
I already know that it uses recursion and that it orders the vectors until they are ordered, but it is exactly in this part that it generates my doubts. How do I know when he will call the Merge…
-
0
votes1
answer69
viewsMerge two array’s recursively without adding new keys
someone has some hint to merge two array’s but the second must replace the values of the first recursively but only of the keys that exist in the first, that is, the extra values that exist in the…
-
0
votes1
answer113
viewsMerge PNG/JPEG with GIF using PHP
I need to make a merge of an image in PNG/JEPG with some gifs and save the end result as GIF. I can do that merge with the code below, the image is saved as gif but it turns out that gif loses…
-
0
votes2
answers95
viewsMergesort sorting algorithm error
I am having a problem with an mergesort sort algorithm in which the output of the ordered vector appears a repeated number and also a memory address. Follow the code: Mergesort /*Funcao que…
-
0
votes1
answer217
viewsMerge the values of an Array inside another Array
I have several Arrays throughout the program to check identifiers Soon in a function I check a include to know if a particular identifier is inside an object the object has the following format {…
-
0
votes0
answers56
viewsVLOOKUP IN PYTHON USING MERGE
I have a dataframe called df with a column of countries in several languages and another dataframe called ct that I have a column with countries in several languages and another column with the same…
-
0
votes2
answers235
viewsCode of some branchs disappeared after merge
I have a very strange situation (probably vacilo right...) here in my repository. I have a branch of DEV and several other of Features and bugs. With each branch of Feature or bug, we merge with…
-
0
votes1
answer31
viewsHow to group identifiers that are related across rows and columns in R
Hello. I’m working with base linkage and have now 2 columns of paired Ids (id_a and id_b). Each pair represents the same individual located on different bases: id_a <-…
-
0
votes0
answers55
viewsLatex - How to merge columns to correct spacing error in the last column of the table?
Hello! I’m trying to merge the third column of the attached code table but I’m not able to develop a code that can eliminate the spacing error in the last column. Note that the text of the third…
-
0
votes1
answer34
viewsHow to merge SQL when the key variable repeats in one of the tables?
I have a dataset with two tables. In the first, I have information of workers and in the second of firms. Each of the workers has a id of the firm you belong to. I would like to create a new table…
-
-1
votes3
answers495
viewsJoin two projects into one
I have two projects in Visual Studio, Project 1 has some things that Project 2 doesn’t have, and Project 2 has some things that Project 1 doesn’t have. So I need to merge the two and turn it into…
-
-1
votes1
answer132
viewsHow to Merge 2 SELECT statements
How to unite these 2 selects? MY TABLES EVENT TITLE DESCRIPTION CATEGORY_ID CATEGORY NAME COLOR ICON DESCRIPTION this select below works perfectly does the right Count I need to do the same without…
-
-1
votes1
answer214
viewsEclipse adds tag to code when trying to resolve conflicts
Guys, the following situation serves only to exemplify what happens when I try to resolve a conflict over the Eclipse. I know how to resolve a conflict, the problem is that after solving it these…
-
-1
votes1
answer27
viewsuse two merges Matched then on sql server server
I’d like to know how to use the second merge I need the following case, knowing that the source is a log, will not happen the "WHEN NOT MATCHED BY SOURCE THEN" MERGE tabelaTarget AS target USING…
-
-3
votes3
answers619
viewsIs it possible to join 2 arrays where the indexes are equal in PHP?
Good Guys, I have a problem related to the use of arrays in PHP. I’m doing an address search on google maps, and JSON returns me the following array: Array ( [results] => Array ( [0] => Array…